From: awilliam@xenbuild.aw Date: Tue, 12 Sep 2006 17:42:27 +0000 (-0600) Subject: [IA64] swiotlb clash fix X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15664 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=b63e1dbb4d8f7536c3eeb7c881bb60378409ea57;p=xen.git [IA64] swiotlb clash fix Do not define dma_supported to platform_dma_supported when building the Xen kernel. This happend to work for DIG builds because the swiotlb.c version of dma_supported compiles to identical code as arch/i386/kernel/pci-dma-xen.c so the linker didn't complain. Signed-off-by: Jes Sorensen --- diff --git a/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h b/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h index 5d0206c469..aadda2addf 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h @@ -84,7 +84,9 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems, #define dma_sync_single_range_for_device(dev, dma_handle, offset, size, dir) \ dma_sync_single_for_device(dev, dma_handle, size, dir) +#ifndef CONFIG_XEN #define dma_supported platform_dma_supported +#endif static inline int dma_set_mask (struct device *dev, u64 mask)